From 4e4436e107165c3092f704791e7e69cf0e4a7830 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Wed, 14 Jul 2004 22:22:57 +0000 Subject: [PATCH] bitkeeper revision 1.1093 (40f5b241mxmikY5krWj5CCgZPeipIg) linux 2.6 Makefile hacks. --- .rootkeys | 2 +- Makefile | 8 +------- linux-2.6.7-xen-sparse/arch/xen/Makefile | 13 +++++++++---- .../xen/{defconfig-xenU => configs/xenU_defconfig} | 0 4 files changed, 11 insertions(+), 12 deletions(-) rename linux-2.6.7-xen-sparse/arch/xen/{defconfig-xenU => configs/xenU_defconfig} (100%) diff --git a/.rootkeys b/.rootkeys index 9c48c4e29d..f5719a7798 100644 --- a/.rootkeys +++ b/.rootkeys @@ -155,7 +155,7 @@ 40f56237utH41NPukqHksuNf29IC9A linux-2.6.7-xen-sparse/arch/xen/Kconfig.drivers 40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.7-xen-sparse/arch/xen/Makefile 40f56237JTc60m1FRlUxkUaGSQKrNw linux-2.6.7-xen-sparse/arch/xen/boot/Makefile -40f56237wubfjJKlfIzZlI3ZM2VgGA linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU +40f56237wubfjJKlfIzZlI3ZM2VgGA linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig 40f56237Mta0yHNaMS_qtM2rge0qYA linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig 40f56238u2CJdXNpjsZgHBxeVyY-2g linux-2.6.7-xen-sparse/arch/xen/i386/Makefile 40f56238eczveJ86k_4hNxCLRQIF-g linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile diff --git a/Makefile b/Makefile index c528512d13..389ca8234c 100644 --- a/Makefile +++ b/Makefile @@ -83,13 +83,7 @@ config-xen%: else config-xen%: $(MAKE) -C $(CDIR) ARCH=xen mrproper - @[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \ - && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \ - $(CDIR)/.config || true - @[ -e $(CDIR)/arch/xen/defconfig ] || cp \ - $(CDIR)/arch/xen/defconfig-$(subst config-,,$@) \ - $(CDIR)/arch/xen/defconfig - $(MAKE) -C $(CDIR) ARCH=xen oldconfig + $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig endif # build the specified linux tree diff --git a/linux-2.6.7-xen-sparse/arch/xen/Makefile b/linux-2.6.7-xen-sparse/arch/xen/Makefile index f7734e040b..961c0d32b8 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile @@ -12,6 +12,8 @@ # Copyright (C) 2004 by Christian Limpach # +override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION) + XENARCH := $(subst ",,$(CONFIG_XENARCH)) # pick up headers from include/asm-xen/asm in preference over include/asm @@ -52,12 +54,15 @@ all: vmlinuz vmlinuz: vmlinux $(Q)$(MAKE) $(build)=arch/xen/boot vmlinuz -INSTALL_NAME ?= $(KERNELRELEASE) +XINSTALL_NAME ?= $(KERNELRELEASE) install: vmlinuz mkdir -p $(INSTALL_PATH)/boot - install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX) - install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-$(INSTALL_NAME)$(INSTALL_SUFFIX) - install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX) + install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + +dist: + $(MAKE) INSTALL_PATH=../install install archclean: @if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi; diff --git a/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU b/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig similarity index 100% rename from linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU rename to linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig -- 2.30.2